use the same code for GDK_XOR as for GDK_INVERT. Xor with an arbitrary

2007-06-07  Michael Natterer  <mitch@imendio.com>

	* gdk/quartz/gdkgc-quartz.c (_gdk_quartz_gc_update_cg_context):
	use the same code for GDK_XOR as for GDK_INVERT. Xor with an
	arbitrary color is impossible to implement with quartz.

svn path=/trunk/; revision=18077

diff --git a/ChangeLog b/ChangeLog
index ee98e6f7ba9449a68c29fee0b464f2583763b680..c3de6f3a6baa2e8be609073a8f78cb290a966a58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-07  Michael Natterer  <mitch@imendio.com>
+
+       * gdk/quartz/gdkgc-quartz.c (_gdk_quartz_gc_update_cg_context):
+       use the same code for GDK_XOR as for GDK_INVERT. Xor with an
+       arbitrary color is impossible to implement with quartz.
+
 2007-06-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtksettings.c: Fix a typo in the docs.

diff --git a/gdk/quartz/gdkgc-quartz.c b/gdk/quartz/gdkgc-quartz.c
index 6bea81ed3a4bcf367fc952a6eeec9ef96dfe5bf0..26273e1a36fde555c3afffa3b8bf04880be061e7 100644 (file)
--- a/gdk/quartz/gdkgc-quartz.c
+++ b/gdk/quartz/gdkgc-quartz.c
@@ -410,15 +410,12 @@ _gdk_quartz_gc_update_cg_context (GdkGC                      *gc,
        break;
 
       case GDK_INVERT:
+      case GDK_XOR:
        blend_mode = kCGBlendModeExclusion;
        fg_pixel = 0xffffffff;
        bg_pixel = 0xffffffff;
        break;
 
-      case GDK_XOR:
-       blend_mode = kCGBlendModeExclusion;
-       break;
-
       case GDK_CLEAR:
       case GDK_AND:
       case GDK_AND_REVERSE: